Revert "ipv6: make ip6_rt_gc_expire an atomic_t"
This reverts commit 49516e6ed91434d022a800321a8bc7d8054f62ac which is
commit 9cb7c013420f98fa6fd12fc6a5dc055170c108db upstream.
It breaks the Android KABI and is not needed in Android devices, so just
revert it.
Bug: 161946584
Fixes: 49516e6ed914 ("ipv6: make ip6_rt_gc_expire an atomic_t")
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ibab89760234525cc5622cd60e61599784fd0f80a
diff --git a/include/net/netns/ipv6.h b/include/net/netns/ipv6.h
index 2f6693f..213e962 100644
--- a/include/net/netns/ipv6.h
+++ b/include/net/netns/ipv6.h
@@ -79,8 +79,8 @@
struct dst_ops ip6_dst_ops;
rwlock_t fib6_walker_lock;
spinlock_t fib6_gc_lock;
- atomic_t ip6_rt_gc_expire;
- unsigned long ip6_rt_last_gc;
+ unsigned int ip6_rt_gc_expire;
+ unsigned long ip6_rt_last_gc;
#ifdef CONFIG_IPV6_MULTIPLE_TABLES
unsigned int fib6_rules_require_fldissect;
bool fib6_has_custom_rules;
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index 2094bd7..7c87948 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -3192,7 +3192,6 @@
int rt_elasticity = net->ipv6.sysctl.ip6_rt_gc_elasticity;
int rt_gc_timeout = net->ipv6.sysctl.ip6_rt_gc_timeout;
unsigned long rt_last_gc = net->ipv6.ip6_rt_last_gc;
- unsigned int val;
int entries;
entries = dst_entries_get_fast(ops);
@@ -3203,13 +3202,13 @@
entries <= rt_max_size)
goto out;
- fib6_run_gc(atomic_inc_return(&net->ipv6.ip6_rt_gc_expire), net, true);
+ net->ipv6.ip6_rt_gc_expire++;
+ fib6_run_gc(net->ipv6.ip6_rt_gc_expire, net, true);
entries = dst_entries_get_slow(ops);
if (entries < ops->gc_thresh)
- atomic_set(&net->ipv6.ip6_rt_gc_expire, rt_gc_timeout >> 1);
+ net->ipv6.ip6_rt_gc_expire = rt_gc_timeout>>1;
out:
- val = atomic_read(&net->ipv6.ip6_rt_gc_expire);
- atomic_set(&net->ipv6.ip6_rt_gc_expire, val - (val >> rt_elasticity));
+ net->ipv6.ip6_rt_gc_expire -= net->ipv6.ip6_rt_gc_expire>>rt_elasticity;
return entries > rt_max_size;
}
@@ -6322,7 +6321,7 @@
net->ipv6.sysctl.ip6_rt_min_advmss = IPV6_MIN_MTU - 20 - 40;
net->ipv6.sysctl.skip_notify_on_dev_down = 0;
- atomic_set(&net->ipv6.ip6_rt_gc_expire, 30*HZ);
+ net->ipv6.ip6_rt_gc_expire = 30*HZ;
ret = 0;
out:
